Fix macro declaration

2006-02-23  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktextiter.c: Fix macro declaration

	* gtk/gtkaboutdialog.c: Remove an accidentally included function.

diff --git a/ChangeLog b/ChangeLog
index cf59788b8d71c8d8881556c2a2270e1a1d6bab89..87a9b28406aec7bd23d17fe27cd27d54bdb6347a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextiter.c: Fix macro declaration
+
+       * gtk/gtkaboutdialog.c: Remove an accidentally included function.
+
 2006-02-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextbtree.c: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cf59788b8d71c8d8881556c2a2270e1a1d6bab89..87a9b28406aec7bd23d17fe27cd27d54bdb6347a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-02-23  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextiter.c: Fix macro declaration
+
+       * gtk/gtkaboutdialog.c: Remove an accidentally included function.
+
 2006-02-22  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktextbtree.c: 

diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 92943962e606212143acd084440e35344bc96af2..5ab9b77cad1edf10c3e9ff1c8e0f37a95a7ef849 100644 (file)
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -127,7 +127,6 @@ static void                 gtk_about_dialog_set_property   (GObject
                                                             GParamSpec         *pspec);
 static void                 gtk_about_dialog_style_set      (GtkWidget          *widget,
                                                             GtkStyle           *previous_style);
-static void                 gtk_about_dialog_close          (GtkDialog          *dialog);
 static void                 dialog_style_set                (GtkWidget          *widget,
                                                             GtkStyle           *previous_style,
                                                             gpointer            data);
@@ -723,24 +722,6 @@ gtk_about_dialog_style_set (GtkWidget *widget,
   dialog_style_set (widget, previous_style, NULL);
 }
 
-static void
-gtk_about_dialog_close (GtkDialog *dialog)
-{
-  /* Synthesize delete_event to close dialog. */
-  
-  GtkWidget *widget = GTK_WIDGET (dialog);
-  GdkEvent *event;
-
-  event = gdk_event_new (GDK_DELETE);
-  
-  event->any.window = g_object_ref (widget->window);
-  event->any.send_event = TRUE;
-  
-  gtk_main_do_event (event);
-  gdk_event_free (event);
-}
-
-
 /**
  * gtk_about_dialog_get_name:
  * @about: a #GtkAboutDialog

diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index a757ad3c67e7818aa0712880c4de6b63e954d47e..f233e6a288add163213167680afacc6ab67bfff4 100644 (file)
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -395,7 +395,7 @@ check_invariants (const GtkTextIter *iter)
     _gtk_text_iter_check (iter);
 }
 #else
-#define check_invariants (x)
+#define check_invariants(x)
 #endif
 
 /**